From 8155ef231fb8446c523e3725f7d85691b69d34b0 Mon Sep 17 00:00:00 2001 From: Mirko Vogt Date: Mon, 12 May 2025 15:37:09 +0000 Subject: [PATCH] qt5base: do not copy qmake.mk file into staging-dir anymore Packages should now include the file directly from within the qt5 directory part of the feed.. --- frameworks/qt5/{qt5base/files => }/qmake.mk | 0 frameworks/qt5/qt5base/Makefile | 9 +-------- 2 files changed, 1 insertion(+), 8 deletions(-) rename frameworks/qt5/{qt5base/files => }/qmake.mk (100%) diff --git a/frameworks/qt5/qt5base/files/qmake.mk b/frameworks/qt5/qmake.mk similarity index 100% rename from frameworks/qt5/qt5base/files/qmake.mk rename to frameworks/qt5/qmake.mk diff --git a/frameworks/qt5/qt5base/Makefile b/frameworks/qt5/qt5base/Makefile index a276afa..1726509 100644 --- a/frameworks/qt5/qt5base/Makefile +++ b/frameworks/qt5/qt5base/Makefile @@ -40,7 +40,7 @@ HOST_BUILD_DEPENDS:=qt5base include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/nls.mk -include ./files/qmake.mk +include ../qmake.mk # hard disable udev support for now CONFIG_PACKAGE_qt5base-input-autodiscovery:= @@ -517,13 +517,6 @@ define Host/Configure endef define Build/InstallDev - $(INSTALL_DIR) \ - $(STAGING_DIR)/host/mk - - $(CP) \ - ./files/qmake.mk \ - $(STAGING_DIR)/host/mk/qmake5.mk - $(call Build/Install/HostFiles,$(1)) $(call Build/Install/Headers,$(1)) $(call Build/Install/Cmakes,$(1)) -- 2.30.2